Skip to content

Bring back "Refactor Commands module" #5864

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Nov 10, 2022
Merged

Bring back "Refactor Commands module" #5864

merged 1 commit into from
Nov 10, 2022

Conversation

neonichu
Copy link
Contributor

@neonichu neonichu commented Nov 2, 2022

This reverts commit cf19c64 and restores the --build-path option. It also switches the bootstrap script back to using it so that we have an easy check that the option is still present.

@neonichu neonichu self-assigned this Nov 2, 2022
@neonichu
Copy link
Contributor Author

neonichu commented Nov 2, 2022

@swift-ci please smoke test

@neonichu neonichu force-pushed the swift-bootstrap-cmd-3 branch from 5d7f08b to 2bb2390 Compare November 2, 2022 06:39
@neonichu
Copy link
Contributor Author

neonichu commented Nov 2, 2022

@swift-ci please smoke test

@neonichu neonichu mentioned this pull request Nov 2, 2022
Closed
@neonichu
Copy link
Contributor Author

neonichu commented Nov 2, 2022

@swift-ci please test package compatibility

@neonichu
Copy link
Contributor Author

neonichu commented Nov 2, 2022

Doing a toolchain build and package compatibility run since we needed to revert this the first time.

@neonichu neonichu mentioned this pull request Nov 2, 2022
Merged
@tomerd
Copy link
Contributor

tomerd commented Nov 2, 2022

why not use --scratch-path instead?

@neonichu
Copy link
Contributor Author

neonichu commented Nov 2, 2022

why not use --scratch-path instead?

Don't think we should block this change on removing --build-path, it was just an unrelated cleanup that I snuck in here. It can happen as a separate PR instead.

@neonichu
Copy link
Contributor Author

neonichu commented Nov 2, 2022 •
edited
Loading

Looks like there's UPASS: rdar://101685791, swift-protobuf-plugin-example, 5.0, 85bec0, Swift Package which is probably because we merged #5855, otherwise package compatibility looks good.

Edit: confirmed, there's a PR already to fix the UPASS: swiftlang/swift-source-compat-suite#733

@neonichu neonichu force-pushed the swift-bootstrap-cmd-3 branch from 2bb2390 to bc6b7de Compare November 2, 2022 22:05
@neonichu
Copy link
Contributor Author

neonichu commented Nov 2, 2022

@swift-ci please smoke test

@neonichu
Copy link
Contributor Author

neonichu commented Nov 3, 2022

Looks like the toolchain build passed, so I think this should be ready to merge, but I'll double-check tomorrow.

@MaxDesiatov
Copy link
Contributor

Ah, sorry about the conflict! 🙈

@neonichu
Bring back "Refactor Commands module"
2c52312 
This reverts commit cf19c64 and restores the `--build-path` option. It also switches the `bootstrap` script back to using it so that we have an easy check that the option is still present.
@neonichu neonichu force-pushed the swift-bootstrap-cmd-3 branch from bc6b7de to 2c52312 Compare November 9, 2022 20:55
@neonichu
Copy link
Contributor Author

neonichu commented Nov 9, 2022

Rebased.

@neonichu
Copy link
Contributor Author

neonichu commented Nov 9, 2022

@swift-ci please smoke test

@neonichu
Copy link
Contributor Author

neonichu commented Nov 9, 2022

I think this is good to go once the toolchain build passes (trying to be more careful to avoid another revert).

@neonichu
Copy link
Contributor Author

Toolchain build passed as well, merging...

@neonichu neonichu merged commit e26417c into main Nov 10, 2022
@neonichu neonichu deleted the swift-bootstrap-cmd-3 branch November 10, 2022 18:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tomerd tomerd tomerd approved these changes

@abertelrud abertelrud Awaiting requested review from abertelrud

@elsh elsh Awaiting requested review from elsh

Assignees

@neonichu neonichu

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@neonichu @tomerd @MaxDesiatov